This repository has been archived by the owner on Jan 7, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 4
Sync upstream #95
Merged
bors
merged 1,748 commits into
softdevteam:master
from
vext01:yk-sync-upstream-20200320
Mar 23, 2020
Merged
Sync upstream #95
bors
merged 1,748 commits into
softdevteam:master
from
vext01:yk-sync-upstream-20200320
Mar 23, 2020
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
submodules: update clippy from 329923e to fdce47b Changes: ```` add CR feedback Improve documentation Use `edition:2018` flag more widely Update tests/ui/needless_doc_main.rs Move links to the end of each chapter on adding_lints Move links to the end of each chapter on CONTRIBUTING Clean-up adding_lints.md Clean-up CONTRIBUTING.md needless_doc_main: only check rust code Use `node_type_opt` over `node_type` Fix doc Fix ICE with trivial_bounds feature clippy_lints: readme: don't mention crates.io since it is no longer used to publish clippy. update rust-lang.github.io to rustc-dev-guide.rust-lang.org Improve placeholder in map_unit_fn Fix match single binding when in a let stmt Improve error messages for {option,result}_map_unit_fn Mention the setup instructions in CONTRIBUTING redundant_pattern: take binding (ref, ref mut) into account in suggestion. check_pat: delay creation of the "normal" vec until we reach the branch where is is actually needed deps: bump itertools 0.8 -> 0.9 add lint on File::read_to_string and File::read_to_end transition rustc-guide to rustc-dev-guide Rename macro_use_import -> macro_use_imports warn on macro_use attr Fix deploy script for tag deploys ```` Fixes rust-lang#69957
adjust Miri to needs of changed unwinding strategy As expected, rust-lang/rust#67502 broke unwinding in Miri. To fix it we have to adjust parts of the engine and the panic runtime, which this PR does. The Miri-side changes are in rust-lang/miri#1227. Cc @oli-obk @Aaron1011 @Mark-Simulacrum @Amanieu
bors try |
tryBuild failed |
bors try |
tryBuild failed |
|
That is rust-lang/rust#69933, which was fixed by rust-lang/rust#70172. |
Thanks! I'll re-sync tomorrow. |
bors try |
tryBuild succeeded |
Right, good. I've used Sound good? If so I will force-push. (It was not easy...) |
Since Lukas was already happy with this, please force push. |
14905b2
to
b979dde
Compare
There we go. Fingers crossed. |
bors r+ |
bors bot
added a commit
that referenced
this pull request
Mar 23, 2020
95: Sync upstream r=ltratt a=vext01 An inoffensive sync with upstream. Co-authored-by: Ralf Jung <post@ralfj.de> Co-authored-by: Jonas Schievink <jonasschievink@gmail.com> Co-authored-by: Camille GILLOT <gillot.camille@gmail.com> Co-authored-by: bors <bors@rust-lang.org> Co-authored-by: Vadim Petrochenkov <vadim.petrochenkov@gmail.com> Co-authored-by: Guillaume Gomez <guillaume1.gomez@gmail.com> Co-authored-by: Amanieu d'Antras <amanieu@gmail.com> Co-authored-by: John Kåre Alsaker <john.kare.alsaker@gmail.com>
Build failed |
I missed a bit. Can I squash it in? |
Looks good to me. |
…nc-upstream-20200320
ef021de
to
9cc7be1
Compare
splat. |
bors r+ |
Build succeeded |
Yay :) |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
An inoffensive sync with upstream.